Auto merge of #4581 - tamird:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 10 Oct 2017 18:36:48 +0000 (18:36 +0000)
committerbors <bors@rust-lang.org>
Tue, 10 Oct 2017 18:36:48 +0000 (18:36 +0000)
commitd6843a77b270b72ae49213adcd2217ab1a964694
tree365500f355a7185de87a3e947eed2804232c2a89
parent5c0e9f1500dbfea8f3fa26a9ac3a89c5d8439dab
parent8b68e5903f0004c662b0816f3bcd2539af9b08fb
Auto merge of #4581 - tamird:master, r=alexcrichton

cargo_rustc: remove workaround for fixed upstream issue

Fixed in https://github.com/rust-lang/rust/pull/25411. Also, the
removed code is implicated in test failures observed in
https://github.com/rust-lang/rust/pull/44515.

r? @alexcrichton